Revise component layout

@hkal https://www.pivotaltracker.com/story/show/67552316