Todo
Fix toolbar height for Yosemite