Feature: Polishing Up

- small fixes and styling issues