Working on prettier design