ticket:1. Minor layout improvement