Refactor css #1
refactor specific-server-api AND css#2