Better logout positioning, settings icon and page