#27 Modified bolt and UI to reflect the suggested changes
#27 Tested and working updates