Improvements design and functionality

Improvements design and functionality