Breaking toolbar into its own view - still plenty of things to do here
Conflicts