Bit more cleanup
Submit and view working to a limited extent