[FIX] a lot of little usability fix