Moving Conditional Locations

moved conditional locations to the elements they effect and adjusted
button styles