Fixes #10 - Improve Indicator Design