Minor updates, polishing up styling, functions