Goncalo/improvements/occureences buttons layout