changed the layout,removed redundant code/functionality,Test wip