Cleaned up some view elements