Design changes and fixed issue