Fixed build errors. Ready for ui overhaul :D