added icons for buttons, as well as more layout changes
Trying to get latest version onto git