- Getting rid of dependency on TitleBarHeight
- Formatting files