Base layout added
small troubles