Rules Update and some Minor UI Fixing