cleaning up layout so that it extends of each other