Changing layouts from lists to buttons
Simplyfying layouts