Fixed drop-down select options. Front end improvements