Restructured and bug fixed the project view