replace views by custom lists & various improvements