Code clean-up, navigation bar progress