improved April layout