Merge changes from 3.0, clean up files in views & crypsis