Added extra customization options and cleaned up

Added extra customization options and cleaned up some of the code
indentation to make it more easiliy readable.
Removed unused icons
Merge pull request #11 from ShaneYu/ShaneYuChanges

Added extra customization options and cleaned up