styling;
arrange buttons;
cleanup
merge ethans changes in