Fix layout issues
Remove rmcat references