merging the green layout
some fixes for the basic ui
foo