more big layout changes + code reorganisation for display methods