Fix button floats
CSS reroganization
Fix CSS issues