Updated

Fixed bugs, modified code, changed the page layout