added a proper structure. working on main page. bed time though.