Checkpoint commit of redesign
More work on css