Added some hard coded strucs and added more dynamic code to views