Feature/first layout

Marge with @vircung frontend files, add some changes.