Changed css and website layout to work better with different size screens
resolve merge conflict