Update

Added tablet view and bug fixes