test done, worked on layout