Minor Style Changes and  new Button