Rules added and minor visual changes