Advanced setup bug fixes
Finish layout and router
Merge