cleaned up look and feel