Refactor and Update Styling