small use case changes and layout