Split up CSS, code style, fix unsubscribing/closing entities