Add server support. Layout could change later on.