Added some new options and <hr>s