FIX: Updated view to look better in the current API versions