Ui improvements

takes over #166