pretty design
server fixes