Improve layout, add framework for main toolbar