changed layout
added test
finish layout
buu