Major updates to style and important function