Changed layout, moved buttons to bottom