Fix: CSS changes to better readability
ADD: resolve merge conflicts in PR/1