Minor updates to functionality and aesthetics