Added AccountType + Icons, better Layout