Fix Glitch and add margin-top