Moved views to many files
Small bug fixes