More work on subscriptions screen layout