edited layouts a bit