Done for today, some UI improvements