adding the tweaks to the UI awaiting for it to be inserted into the main code branch