Hopefully finished fixing the spacing issues