Merged GUI  changes (add page) and base functionality. Login logic not finished yet