add custom location for debugging
Fix label issue
add icons