Small desing updates
Small desing updates