Some housekeeping and earth shattering UI addition ^_^