Swifted homepage buttons top the top
Improved map responsibility