add server and server port fields on pages
merge files from remote repo
fix:merge bugs