Major changes

Major changes across the app but still some major bugs