Changed styles and other fixes