Color picker and small fixes