Cleaned up views a little bit