Adjusted minor visual changes.
Solved picking bug.