[N/A] Some UI improvements

Reviewed by N/A
[N/A] Fix failing specs

Reviewed by N/A