Fixed upload button, changed look of menu, fixed grid