Changes and simplifies layout