added test and change layout
some funcionality