Indent standards and UI changes
Code cleanup
Fix #25
Fix #26