Layout updates, fixed fallback behaviour for multiple accounts