UI tweaks and some bug fixes
Merge pull request #43 from airauth/crad

UI tweaks and some bug fixes