Added Indexes and button padding
Added Indexes and button padding