updated layout and fixed server