Finish all refactoring
Keep second div lip at 35px