more intermediate templates & smarter account page