Merge pull request #12 from udsholt/next

Active controller and styling