updated server and basic layouts