Will merge
Added pretty error box