Testing
More fixes to setup
Reduced code
Styling stuff