Fixed TODO, all functionality is OK but some CSS seems to be missing