setup initial layout
merged branch with master