bunch of UI fixes
Merge pull request #75 from Murkantilism/samDev

bunch of UI fixes