Update TODO and remove css from media