cleaned up UI a bit, used SCCS