Cleanup and a bug fix

Also, added rendering for currently selected tool