Commit after making UI enhancements, making settings popup work and allignment of menu tabs