New layout for Account view + add'l cleanups