image layout a bit cleaner