Design tweeks
Design tweeks
fix merge conflict