another redesign
css merge conflicts