Added a usable Matrix Builder and added more functionality to pages