added oath, fixed mainLayout rendering