Layout update

layout update
Additional Layout updates

Updated comparison change with javascript and button layout