Fixed more code, added custom css