major progress made, added buttons and fixed layout