Tweaked settings and layout