Add good status handling and styling