WIP layouts for cinsistency, add calendar gem