Components page improved