Minor tweaks while working on UI. See: websharks/s2member#155
Minor tweaks while working on UI. See: websharks/s2member#155