Still messing around trying to get the UI to work properly