Fixed #51 Is agenda layout ok?