Start of more structured UI & touches. Also fixed some bugs (Related)