cleanup layout, better display of internal and external status