Updated layout and checking point