Improved design with functionality