Add: More robust, slicker style/layout rules. #11 #4