Cleaned up some formatting and admin views