Improve layout to match new theme