Fixing some locations and styles