Resources working, with small details that needs to be fixed