Added additional error handling & styling