Hotfix, wouldn't run, rearranged some view stuff.