Fixes for Issues #21 and #23

For Issue #21: Made sure it works in all views.