improvements and re-arrangements in the UI