Tweaked UI and added commented test code for later