Cleanup and moving the add view to a seperate class