DAR-2366, small cleanup refactoring
DAR-2534 reverting DAR-2182 fix
DAR-2366, add missing 10 px margin to rail width