some fixing after last layouts system change + some css work