Crash fixes, Style Updates

Updated some styles and colors. Several bug fixes as well as more code
clean up.