Feature/layout design update1