implements Manolo comments + change layout