Toby branch remotepage

Fixed issues Shilad mentioned in the previous comment