layout now working more correctly