fixed spacing in main activity
fixed conflicts
padding added