Add support for subscriptions and improve layout