logic fix, also ui style unification