bug fixing and minor changes in layout
restore history ...