Home menu settings + modal bug fix