Added tracker functionality and layouts. Other layouts modificaitons.