Quick placeholder fixes so that the UI dev can progress. Definitely temporary code statements until further review. Left TODO comments next to things.