APD-40:refactor css