#98 refactoring css to remove duplicade code