Added borders, small bug fixes
Merge branch 'master' into ws-direct