Tweaked design and linked buttons