Reimport

- fixed alignment of text a bit
- reput in all the old functionality