Issue: #2

  * Fixed some visual behavior and logic