Removed/hid certain fields
Merge branch 'beta'