Fixed left paddings on the first controls and removed unnessasary code.