Components page improved and other improvements