updated with new project and changed some styles