Fixes and new Views