Addresses #29 - first attempt at topcluck redesign