I gang

Layout redesign and button slicing