Minor fixes and ui cleanup. Still work in progress