Code Cleanup
Visual updates to + button