Added image buttons and changed general layout