Password/Username included, Empty Plan Handling, Strings, better color indicators,, UI Improvments