basic redesign of layout