Adjusted margins, and created buttons