bootstrapped version, small visual changes