code cleanup
working on look and feel