Layout fixed, console added