Updated numberline changes + main GUI edits