Cleaned up static and user views