Cleaned up source and updated ui a bit