adjust styling and behaviour
behaviour changes
some optimization
Merge pull request #1 from sinuit/master

adjust styling and behaviour