updated layout links
appointment and login updates
fixed merge conflicts