Done following:
* split styling
* split contexts into seperate controllers