Settings refactor & improvements

* Add test for GitHub user layout
* Fix test for settings page