Added the return error and fixed some css