Added edit buttons
Visual improvements
More visual improvements