Error-Recovery, add console to layout and some minor fixes