Finished adding multiple entry support, including some styling changes