So many small changes

- updated drawing function
- shuffled rules/align setup