Bug fixes, view enhancements

Unified look, misc fixes