Tidy up styling to fix black on black, etc

Also removed nbproject folder (netbeans)