Implemented setting component values if OS has failed

Also some layout improvements