Improve subscribe layout