resolves #1, main layout is finished
merging