Near final changes

Everything except app buttons for project are done