Moved Inputs out of Labels, fixed a number of styles