Cleanup. Added toggle to s/h side and bottom bar