changed layout a bit, fixed check for account type