Working server. Tidying UI