added testing,   started functionality testing

changed layout, added testing