Moved and commented stuff.

Button Navigation still needs tweaking.