Feature/bandedo/design tweaks