removed states for icons on the navbar
Removed loginpage state from root object, navbar is now borderimage
made navbar elements children of navbar
made navbar elements children of navbar