update layout and form usage, also added token data sets
remove DS_Store