Added configuration to show/hide features and other bug fixes

Change-Id: Ibbc44aa073c3767a5f4e0d613f6c8a4fa0010cd0