Added HomePage and MessagesPage
--services--