New build with slightly better styles