some visual improvements, basics for other future options
Merge remote-tracking branch 'origin/master'