Cleanup, CSS help
Fix bug