adjusted spacing and layout, removing hard coded pixel values without dp() or sp()