Fixing spacing issues