improved layout even more