work on layout improvements