fixed UI issues after Friday's discussion