Fixing positioning and formatting