Closed #203
Closed #201
Smaller UI fixes