Added math library option, removed tabs