PSL-7 PSL-2 #time 40m devise added and layout fixed