working on layout fixes