change layout  and fixed comments for approval