working on look and feel and cleaning up unused code