ticket:2 Last commit layout fix