style, and clean up
basic functionality donezo; content switching