Error handling + improvements in styling