DB Modifications applied + edits on aesthetics