added last minute error checking and prettier views