This should fix the mainactivity problemes... for now