Update design, move elemnts around