Modified layout a bit