General ui

Various UI fixes broken down to individual commits