updated views and forms, looking good