Updated layout & etc