improved layout, expanded server