little cleanup. Next to do:
- dehardcode strings
- make layouts nicer