cleanup

- includes
- css fixes