Added alignment option to data display
Completed Layout and demo

Demo only. Not integrated yet.