Commit 80

UI changes. Slight alterations to existing code to improve performance.