Cleaned up views and scaffold
fixed stupid errors