Added testing layout, make working