Fixed #133, New UI Design based on Designer suggestions