Fixed some margins
More tweaks