More Ui hardcoding, no longer full screen, rebuild