feat: implement aesthetic changes
Merge branch 'developer'