Added comfy and initial layouts
added devise