random changes
fixed merge confilcts
small show page change