Fix markup for controls and actions. Update styles