Some layout enhancements + updated to angularJS 1.2.15