Style cleanup, begin to work on display functionality