Continued work on features panel