Fixed minor user interface errors + logic