Did some final updates on UI and code readability