Updated Layout

I just copy-pasted the layout from my branch to here.
The master seems to run in my Samsung despite the error messages (but of
course no functionality is yet connected to the layout so...)