added includes folder and navbar