More layout changes to static