some small fixes and visual changes
Locking at current version until NoBrainer updated