frontend styling
merging