Styling, js-Fixes
Pre-Final