fix layouts errors
remove redundant elements