Cleaned up views a bit