changed buttons layout, moved gradient css to separate file, misc changes
fixed merged conflict