David Thomas
cleaned up UI
999d347