Fixes and some UI design.