Layout and Style Changes BETA 2.0