Fix designing issue