- Solve Minor issue of design