Added Watch List

fixed bug on training data
changed default layout