More eye candy
Fixing the code completion buttons to work better with now more complicated completion items