Remove quick definitions. Add ability to use custom layout and date formats